From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Sat, 20 Mar 2010 10:43:59 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~7151^2~93
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=c3d85e4ad0ea198ad48fb8e6b001c1d3bbd2849e;p=emacs.git

Merge from mainline.
---

c3d85e4ad0ea198ad48fb8e6b001c1d3bbd2849e